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