Merge changes from topic "am-f51cdf24eafc4dad9bc322272f1b0617"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9edb4270 -s ours am: d55869f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96f6e210 -s ours am: da1da5ae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 588e00b3 -s ours am: 0142887a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7b2b12e -s ours am: d7b47629 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0712e300 -s ours am: f5c96149 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb0724f8 -s ours am: e8694ae6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6c50a76 -s ours am: 535cc3d3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d373b39 -s ours am: edbb5422 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a75051d0 -s ours am: 230cefc5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1f84c8f -s ours am: e156a0a3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c69ca3b7 -s ours am: dca91863 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a607f358 -s ours am: b7e627b5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7a39df56 -s ours am: e8a7635a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e24113c -s ours am: 02d055f1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 861140ee -s ours am: 0075a6f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d7c0673 -s ours am: 161888d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2eff6ae2 -s ours am: 5def8f67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1a4f4b2 -s ours am: 98211e73 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2ede8589 -s ours am: 8ce300bd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1be25fdf -s ours am: 5313c20f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5fa3d7bf -s ours am: b1329fe3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ac520b3 -s ours am: 1ceb282b -s ours