Merge changes from topic "am-0d0344fc1ad548bcaba1cfc86709d664"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e49c7f1a17 -s ours am: 48b9567956 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1ae7fbbcf -s ours am: dae35eedda -s ours