Merge "early start zygote_secondary as well" am: a0bf415cad am: b7896f0a0d am: 1abccccb71
am: 93ee9b3cb3

Change-Id: I8080e62c965fce0db456e3f61a2098794d5e448e