Merge changes from topic "am-19031a01c5194a14aa30c4aed034267a" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: a58bacaaee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14c3a4c0a7 -s ours