am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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