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

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