Merge changes from topic "am-68398f5b5b774f10bcf3d076ee768184" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1a007003 -s ours am: 8d0d4269 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e98b7d2 -s ours am: 57fdcf0b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bde2b964 -s ours am: 4492f179 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3983032d -s ours am: 8d6fd883 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d8efd5e -s ours am: 026c95d3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 954bd171 -s ours am: 15109457 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4c401af -s ours am: 1145fb32 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45e7c448 -s ours am: e3fc293e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1fc95fcd -s ours am: bbb4d57a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6496ea2e -s ours am: d707da93 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 563d0920 -s ours am: ca0eb84b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4324e69 -s ours am: 86270e61 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7bd94ae8 -s ours am: 33594ce1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba72995f -s ours am: fc6755dd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: abbbc229 -s ours am: 2213591e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6b9b6d8 -s ours am: 14c92436 -s ours