am 0ec8dc76: (-s ours) am 20452f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0ec8dc763a9194d3c302b3fca72126b3a6ab09f9':
  Import translations. DO NOT MERGE