Merge "Don't defer zygote" am: e820afdadb
am: 7b1d78b008

Change-Id: Iedc907e47211ac0867c7a5850edb293618796217