Merge "Ensure update_verifier run before zygote" into oc-dev am: 40082926b2
am: 9c8b804c24

Change-Id: Id06952abae512bc165555d2c0fb2f706da2a0a05