Merge changes from topic "am-436f8525138a4d51bbbbb087fe61518c"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 98ac3bd2 -s ours am: 7462fc4a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69cf21f -s ours am: 360b1fe5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ef07bd1b -s ours am: 5b43c4e3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d27300e -s ours am: d520ceda -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aea8915c -s ours am: 3cc22c69 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf56a8b6 -s ours am: 99b6f7f2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6181ae7 -s ours am: 20eb13b9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9394f408 -s ours am: a32c4e85 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 99946801 -s ours am: 6e9899fe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e2cf5da -s ours am: b4b37641 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: be6db1d4 -s ours am: bcb62669 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4315e58f -s ours am: e252cbca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a1ca431b -s ours am: ab613eee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1f9d028 -s ours am: 632c6b68 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 62f5382b -s ours am: f8139f58 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a80cb6d0 -s ours am: 85f8aeaf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6c412a36 -s ours am: 5964421a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98054703 -s ours am: da297f62 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 175cc856 -s ours am: df24d4a0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e3292cd -s ours am: 3e7a9e6d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c2e46124 -s ours am: b9f16380 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eee20ae8 -s ours am: 3a039234 -s ours