Merge changes from topic "am-68f07433cc324818a871e556630fc136" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7e9e6acc70 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e666db3002 -s ours