am f6d289f4: (-s ours) am d56b9e88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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