Merge changes from topic "am-29d862ff3c154eb08831104e620095b8"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da -s ours am: 2ffa916b -s ours am: 8c855c6e -s ours am: 4f0ca15a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f84 -s ours am: e4ceca1e -s ours am: 686fda7c -s ours am: 7ffc5f21 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d -s ours am: 9fc25705 -s ours am: 4165978c -s ours am: 8958207d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b0844 -s ours am: 689cc72e -s ours am: b48e87a7 -s ours am: ab392389 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b -s ours am: 046354c9 -s ours am: 24d3a328 -s ours am: 189a7e44 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d9 -s ours am: 510c5dcf -s ours am: 2aaa6a4b -s ours am: 2df8731e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8625d030 -s ours am: 5528905c -s ours am: 881b8abd -s ours am: a4f08063 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe9973 -s ours am: 7dcfe1aa -s ours am: 25849744 -s ours am: 08218f89 -s ours