Merge changes from topic "am-34ea56a49ad34136a9c961933968e3de" into udc-dev

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