Merge changes from topic "am-ff23327bdcbe407095a8ccc3382c38a0" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0b927d3b -s ours am: 2c83c30d -s ours am: 636c8d6c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a6b00b6 -s ours am: df772fad -s ours am: 93d591cc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: aa1ad991 -s ours am: e1f7f675 -s ours am: ead52660 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5ccfc6b -s ours am: 0652784d -s ours am: e1d52f8c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5f862fe8 -s ours am: e18cb236 -s ours am: 496deebc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dde3dc7 -s ours am: bb84c19b -s ours am: b54aed0a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9758e7ec -s ours am: eae70c1d -s ours am: a21e77f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad758437 -s ours am: 977dfbeb -s ours am: f7c5b632 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 92023faf -s ours am: 03105af8 -s ours am: 72d5a985 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90233045 -s ours am: caa722e8 -s ours am: ff1776d2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25e12b1e -s ours am: 95863a22 -s ours am: 79936036 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f961ac7c -s ours am: 11d7942c -s ours am: 4cf13fea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d5a13d96 -s ours am: 4685219d -s ours am: 5ca49bb4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f26c5391 -s ours am: 1107fd7b -s ours am: 4068d573 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7eb52a20 -s ours am: 7bf16de9 -s ours am: 8321544a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc5992c -s ours am: 4f4b6053 -s ours am: a638e337 -s ours