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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02768bcf3b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f2e5db18d -s ours