am 1fec9757: am 8aec061f: Merge "Fallback to quick in case of soft verification errors"

* commit '1fec9757f37921816d7ae16b5d554472bcc2c6da':
  Fallback to quick in case of soft verification errors