Merge "Fix bug in verifier: soft fail was hiding hard fail." into nyc-dev
am: 1621936c1b

* commit '1621936c1bdf8263e7e9f2d88f16ccaad5d3de81':
  Fix bug in verifier: soft fail was hiding hard fail.

Change-Id: I519f25a72c51306f19b99606aa731d19c17a4943