am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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