am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'eb1618cf4b4d55d332ab76afb2c0ab1397495a5a':
  Import translations. DO NOT MERGE