Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a am: 615211301e am: 2e211888c0
am: 1a6eb1628c

Change-Id: Ia7afc768cc1f140787f99c021859a99e59fa0762