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

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560 skipped: 30665c39 am: 63d11d63 am: 33a9865f am: 1124e30f am: aee85fd4
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560 skipped: 30665c39 am: 63d11d63 am: 33a9865f am: 1124e30f
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560 skipped: 30665c39 am: 63d11d63 am: 33a9865f
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560 skipped: 30665c39 am: 63d11d63
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560 skipped: 30665c39
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1 am: 6ab25560
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb am: f5e0e9d1
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcb
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)