Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev am: cf1268a5f5
am: da96cb4086

Change-Id: Ibddaa8aab5157b8480adb05c0cb8306d414c26eb