Merge changes from topic "am-dd8c69c10b344f3180f2fd03dd449db6"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ce944699 -s ours am: 26fe0623 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2aa37fc6 -s ours am: 36e3bc9b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97eee9f0 -s ours am: 0e69600f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03a738a6 -s ours am: d0dcc6b0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 54cabdde -s ours am: eb93d846 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a9fca7d -s ours am: f9ed2f62 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 64bbf7fb -s ours am: 77801527 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47c4fec0 -s ours am: 49acc394 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 57effef0 -s ours am: e2ff77c0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0353bb6e -s ours am: 50efbedd -s ours