Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3
am: 29a0f68c11

Change-Id: Ic7e700c71062486cc5a281c9fa36c39354893ecf