Merge changes from topic "am-b5578662fcd8400f84906704012a3e6d" into udc-dev

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