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

Change-Id: If5274001db2e455c34f9bbec2c2417e61e3a2620