Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa6476 am: a8ea95fd
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa6476
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name