Merge changes from topic "am-7a9babb1c54041558d7a677d75aad03f" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e756e78 -s ours am: 32a4f97b -s ours am: 019c6aa5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77a0151e -s ours am: 525a22aa -s ours am: 6a29fb38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 75edbdd6 -s ours am: 8f16618f -s ours am: 0751ba9d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0de3250 -s ours am: 8d06e399 -s ours am: 6a37a5b5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e9939908 -s ours am: 1071f46e -s ours am: 57b99fc2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: deca4021 -s ours am: 3293d510 -s ours am: cb198ec4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0d4cb303 -s ours am: 59b16e0c -s ours am: 384d0955 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a6d82e -s ours am: 8eabee78 -s ours am: 86f804ec -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 669b08b9 -s ours am: 69d93c46 -s ours am: 40d0e699 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 873a876d -s ours am: 3d4918a3 -s ours am: 5833279f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1daa9fa9 -s ours am: 0539bfc8 -s ours am: f644e9e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb9b56b3 -s ours am: 2fac776d -s ours am: 6bf77546 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25ad1748 -s ours am: 69febf5d -s ours am: 20d2b689 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55988c69 -s ours am: f59128c4 -s ours am: 7811d841 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b7c701 -s ours am: aed120a3 -s ours am: 5fb42804 -s ours