Merge changes from topic "am-d6cdf67c0b304672976b85a2cb88c04a"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4edda7ef -s ours am: 37fd8a1d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 18e4537d -s ours am: c68ddc22 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8bef3c34 -s ours am: bfed53f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9281aa9 -s ours am: a18b92c1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 122229d8 -s ours am: 1ee56d9b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b41fd1ba -s ours am: e5de23a5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34a5c7d9 -s ours am: c45efccf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d40c1e8 -s ours am: 4e6dc143 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 146d9305 -s ours am: d91bd951 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff15a8fa -s ours am: b5221165 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5e67f0f3 -s ours am: e083a2ec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f305b784 -s ours am: 994abcd6 -s ours