Merge "Fix bug in verifier: hard fail allowed following softfail" am: 61046e1000
am: c5ad1ce723

* commit 'c5ad1ce723dd914ae573cba7618c174d8f4f4b77':
  Fix bug in verifier: hard fail allowed following softfail

Change-Id: I85235c0c47d4214ae2ad1a703580f58c5f4c0473