Merge changes from topic "am-690a757853224cf3afc67ab6aa353037" into udc-dev

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