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

Change-Id: Ice82dbf88fb37c4c8d0c7efb46a7edc8472a81b1