Merge changes from topic "am-0e8e6c39cc5946e1894c7d6d8a967c73"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20a5b485 -s ours am: 3c8f8086 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 071b1f9f -s ours am: cb5ced02 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f91ce12 -s ours am: 979e5bb1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d7bd509 -s ours am: 85816c31 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 23c95882 -s ours am: b522f4e8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c417fd85 -s ours am: 12a60025 -s ours