Merge "Revert "Ensure update_verifier run before zygote""