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

Change-Id: I081414e6eff9c9bae3b9152760da580439d376aa