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

* commit '6ca01465a7b2a0b293756243388cff2a1bb0a5bb':
  Import translations. DO NOT MERGE