Merge "Remove the local cached BluetoothClass"