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

Change-Id: I7459f4f175d6084c587a4291e377a3e1f9ef54d2