Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3 am: 29a0f68c11 am: 73fc12cbda
am: 1214e236eb

Change-Id: I13cb7894245cd242890574473a60a636dc598854