Merge "Ensure update_verifier run before zygote" into oc-dev