Merge "early start zygote_secondary as well" am: a0bf415cad
am: b7896f0a0d

Change-Id: Ibc070c240c73366e992fd289799b8f618f5e6bb7