Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8 am: 1839e70c am: cdc99a0e am: f145e817 am: d72de1bd skipped: 2005cc70
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8 am: 1839e70c am: cdc99a0e am: f145e817 am: d72de1bd
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8 am: 1839e70c am: cdc99a0e am: f145e817
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8 am: 1839e70c am: cdc99a0e
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8 am: 1839e70c
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0 skipped: 365fb1c8
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce am: 0cd0cef0
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07 am: 8fbe4bce
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe07
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name