Merge "init: Improve readability of the code in SecondStageMain()"