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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f14fc0300f -s ours am: 9bc5ba4e7d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccf379e128 -s ours am: c4c75c8837 -s ours