Merge "Bluetooth: Prevent BT crash using adb commands"