Merge "init: Reworked how we wait for COLDBOOT_DONE" am: 57c31d0f17
am: 6be1d976f6

Change-Id: Ibcd178a0173e45ba32dbdd724436f0a4389df021