Merge changes from topic "am-51fd68812ead4838b6b380fea9e58ed5"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0310a2e1 -s ours am: 3f52faef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c0e83e7 -s ours am: e5eae8d6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d43c8665 -s ours am: c88a227e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d9d7496 -s ours am: d2e13a50 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d02b9563 -s ours am: 59df08da -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a91f90ec -s ours am: a8572d7b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 473757d0 -s ours am: 48aef39d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71d19bac -s ours am: 99ccb6fd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 862c50f9 -s ours am: d4f21650 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9c024c4 -s ours am: 997bdd48 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cb7de6d0 -s ours am: e3767bb7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14ec913 -s ours am: 2dce9481 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11dedcb8 -s ours am: 9d024b69 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98bc7dcd -s ours am: c0d8086b -s ours