Merge changes from topic "am-51863e3c44a04dcd963f29b573b05d9b" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e756e78 -s ours am: 2afc05cc -s ours am: 4cdc650d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77a0151e -s ours am: a9ac1e0c -s ours am: c3aa76ad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 75edbdd6 -s ours am: 3aa48110 -s ours am: a00d9f47 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0de3250 -s ours am: 210784de -s ours am: ed9ba743 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e9939908 -s ours am: e3e32562 -s ours am: 51b92b28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: deca4021 -s ours am: 435f76ff -s ours am: b6dcf6b6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0d4cb303 -s ours am: e2003ae8 -s ours am: c4f59ab8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a6d82e -s ours am: a9680c65 -s ours am: 9dee95e1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 669b08b9 -s ours am: 1c2fbdc2 -s ours am: a675c1bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 873a876d -s ours am: c1972cd7 -s ours am: e1c3bd97 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1daa9fa9 -s ours am: cae47dd0 -s ours am: 9ea5cf3e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb9b56b3 -s ours am: 64c79f53 -s ours am: 3b0daaff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25ad1748 -s ours am: 5797e56a -s ours am: 0712bd5b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55988c69 -s ours am: b1fdcc6c -s ours am: 662091cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b7c701 -s ours am: 8e560ab1 -s ours am: 8aca3015 -s ours