Merge changes from topic "am-7944c17159bd4454955cb279bdec7631" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 4db8282787 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98989b6ea5 -s ours