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

Change-Id: I9b862f104d5caa4708ac57c4a2336920213b20fa