Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3da9404dcb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fdf0e3108 -s ours