Merge "Move to new BluetoothUuid constants"