Merge "init: clean up the 1st/2nd stage init split" am: 3ecaf2e7f5 am: 8f1c2fc80e
am: 7cb240d765

Change-Id: I31005c3f9b0f0b863b20ec783236c6cecc4e9dc1