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

Change-Id: I01c62af672d4ee05ac381532d4c580325b008676