Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" am: a10bd47d60 am: c509c36892
am: 83b8df0e8c

Change-Id: I2dcbc2315f282ba87cf69d105ff2dbc9e6ebfc1d