Merge changes from topic "am-3e28999c99fa48bbbebfbdc7a61e7f34" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 6b136d2571 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9ba969358d -s ours