Merge "init: cleanup is_first_stage conditionals"