Merge changes from topic "am-35ba34b55c0141f9a02132b563af0c28"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c01456d -s ours am: 8e405c51 -s ours am: 2fd5e8d6 -s ours am: 8aecf77e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e980f132 -s ours am: 6c21ff21 -s ours am: a48f3dfd -s ours am: c3db4361 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3d552257 -s ours am: bc9a810f -s ours am: c1e9d205 -s ours am: 964bf575 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d49d5c40 -s ours am: 0e2e16c7 -s ours am: fd7ede67 -s ours am: 4bf5da24 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 03a1a92c -s ours am: 58cf7ec1 -s ours am: eda2d87c -s ours am: 6ec3df35 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 148676f7 -s ours am: bf55c52e -s ours am: 7b858e35 -s ours am: 030360ef -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8f6e274f -s ours am: 7cea8e66 -s ours am: 9c80c442 -s ours am: 870a5cca -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00043fdc -s ours am: d72343ca -s ours am: 6a8b6a75 -s ours am: 5b44efeb -s ours