Merge "Don't defer zygote"
am: e820afdadb

Change-Id: I22ef906c81669e54e6d699260dbc1d66d0d582c6