Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172 skipped: 874c5178 skipped: 551be9a8 skipped: 93ee1bd1 skipped: 30d0145e skipped: b9aa0fbf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172 skipped: 874c5178 skipped: 551be9a8 skipped: 93ee1bd1 skipped: 30d0145e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172 skipped: 874c5178 skipped: 551be9a8 skipped: 93ee1bd1
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172 skipped: 874c5178 skipped: 551be9a8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172 skipped: 874c5178
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7 skipped: cb665172
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb skipped: 5b4de5e7
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb
  Merge translations of Bluetooth confirmation text