Merge "Move zygote start after loading persist properties" am: 5b993e3861 am: d71c8bec98
am: 62b0e1056e

Change-Id: Ib4d1ba1ecdbddf143de1002b4d36851be7a1047f