Merge "Ensure update_verifier run before zygote"