Merge changes from topic "am-8c3d1d84965b4fbe8030bd98a89ef613"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8ceb -s ours am: 8dce6998 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee696af9 -s ours am: a062aa3b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbbb0e59 -s ours am: ea73638f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47a97c1e -s ours am: c5e2bc9e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a9d70f2 -s ours am: 8f29e6d5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 286b34b1 -s ours am: 07d9ab29 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fe2af5c8 -s ours am: ae3aad83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d3c8cc1 -s ours am: 4120e575 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d76e95c -s ours am: af7c2928 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e09c2462 -s ours am: 50a547fb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c95f27e3 -s ours am: 76196b4c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 436e4dee -s ours am: 91dd0736 -s ours