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

* commit '0ea794bc03d0e5c1f48f0595e93cbc58006d0c9e':
  Fallback to quick in case of soft verification errors