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

Change-Id: I38e20d92a96ed9674f5d53627222a2af4b6e48fd