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

Change-Id: I9cbac7eb2910da96493bf9651ab2e1719d7a3d42