Bluetooth changes from CM

Change-Id: Ied6bc46f07f7ebec3a26d8bbf1f67ce30842cd7d