am a033e8fd: (-s ours) am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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