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

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

Change-Id: Ic3ed8b94b8d6f4fce4763a6770dca728c0aa57b3