Merge changes from topic "am-56d9c9568f6a4f539fe1a7ccae59f2f7"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c519351a -s ours am: 6bc6cd41 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b4af28ce -s ours am: 25f84055 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e861ba04 -s ours am: ec0b8ad0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35e5f47b -s ours am: 1fe2bfe6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f9e66828 -s ours am: 4837a18b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7dd539ed -s ours am: cc6606f7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b282cdf0 -s ours am: 01e86b12 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2652e1c -s ours am: c4b3e36c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b3fb6312 -s ours am: 3aa6e97a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 678430ac -s ours am: 4c3f35b8 -s ours