Merge changes from topic "am-f763572d0dcd4b839f2d60beb01ed4ea"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 51287928 -s ours am: 099b5f40 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b0c9c1b -s ours am: a07c22de -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: debfa878 -s ours am: 747ad490 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b822691 -s ours am: f5e09fe5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa7da65 -s ours am: f20f30be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f11d242 -s ours am: 4588798d -s ours