Merge changes from topic "am-29d4377f86834d20aee0b4f60504a0d6" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 2c92be32c4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76d3e3a30d -s ours