am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '804aad7383e8ee592048e1bb227ef483b1ba70c7':
  Import translations. DO NOT MERGE