Merge changes from topic "am-1b29401dfe1f4b059ba177c15ba6faea"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 868c55e1 -s ours am: 2ce6de23 -s ours am: 2446f96a -s ours am: 4a59bcb9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c160317 -s ours am: e6b40bf2 -s ours am: c649751d -s ours am: 2afdcba7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1174bbec -s ours am: 0042e05a -s ours am: 239dc4f1 -s ours am: c659e81f -s ours