Merge "Fix bug in verifier: soft fail was hiding hard fail."
am: 80fd43eead

* commit '80fd43eead361bd3b61d646e5c8efcdd0720304d':
  Fix bug in verifier: soft fail was hiding hard fail.

Change-Id: I06cc59ef8453df8cb3e56f54eb2d86f52fb2c3de