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

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

Change-Id: I764cc612f6d2107e4d347ad18d9e50c22f54e72c