Bluetooth: some fixes to bt

Change-Id: I6d4209ca0eb98341ae461de01f1406fefb18f2eb