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

Change-Id: I084851d6806f82080c37a8ef97c984a039d42f04