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

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