Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into oc-dev

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a am: bcf040b00c am: 37372aa4ec am: 3a501fb77b am: fa56bb0ab9 skipped: d8198b806f
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a am: bcf040b00c am: 37372aa4ec am: 3a501fb77b am: fa56bb0ab9
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a am: bcf040b00c am: 37372aa4ec am: 3a501fb77b
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a am: bcf040b00c am: 37372aa4ec
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a am: bcf040b00c
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)