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

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