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

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