am 7bf641ed: (-s ours) Merge "Fix stale root error in verifier"

* commit '7bf641ed4d7d87f70e0e3a052ad35d15031cffcd':
  Fix stale root error in verifier