Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"