Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0a
am: b177ead3d7

* commit 'b177ead3d747d0565dd3e87bb2afa765ec7e54fc':
  recovery: Refactor verifier and verifier_test.