am 67f8b3e1: am 0ea794bc: am 9134a1a4: Merge "Fallback to quick in case of soft verification errors"

* commit '67f8b3e16d0b7561ee36dbbe8958cde033179453':
  Fallback to quick in case of soft verification errors