Merge "init: only provide control message results for devices launching > Q" am: 0b482ad25b am: 2c9ac318ec
am: ba8bb40b21

Change-Id: Ia85188dba77c93bcf751eabc3a7c98e8c06ace6c