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

Change-Id: I9eaa884fc05e2c6136537fe8181ebfb02cc2fd16