Merge changes from topic "am-73bb4c2bdb294c428b32f2fd74a86ef4" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 94df684f61 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e543dfc98 -s ours