Merge "Refactor update_verifier into a class" am: ff29eb7f12
am: 4c65ab54c1

Change-Id: I5c974112c6f6e23f7b550e786eb10fe42a217f7e