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

Change-Id: I7718b4b068463f334963045382f1783e49a280f8