Merge changes from topic "am-2311cd85895f47ffb2344416d9ff7595" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4a95e5fcde -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7407e6dbc3 -s ours