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

Change-Id: I4c0ef5256cb46a3af8f7c7ad61cebe298f23e185