Merge "init: cleanup is_first_stage conditionals"
am: 1d1de8e282

Change-Id: I634e43d40165cddab25c2557839105be0dc27481