am adf64196: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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