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

Change-Id: I6e68cc3688589b88ae9a3284322dab620758670a