Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7c7d3c5ac7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98a14a3745 -s ours