Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name