am 5085a893: am fddae069: am fc4fb0fd: Merge "Revert "Fallback to quick in case of soft verification errors""

* commit '5085a89387481f01a6b9938aa84cca982085e69d':
  Revert "Fallback to quick in case of soft verification errors"