Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a
am: 615211301e

Change-Id: I8331e8769b00f50bc4009d935c3bd6c7b6668381