am ee63d2f1: (-s ours) am 8e3f5ce1: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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