Merge branch 'kk_2.7_rb1.17' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-11.0

Change-Id: Ib460c32432ea10a749e75b30e67d9587a1c13fb1