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

Change-Id: I294286840c969fba42ff2814423ae4dbd81a8577