Merge changes from topic "am-2a41105a03a94bcf8a076377cdeb2ed3" into udc-dev

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