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

Change-Id: I24be7dbc5f75942ae459753f64ef1bc569791880