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

Change-Id: I824f32d950d089b178bdb8e3abfbb83f3a8ed370