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

* commit '9340911fdde0dd881eba33a546d9246233e9d9cf':
  Import translations. DO NOT MERGE