am 2301416d: (-s ours) am ed04bd9e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2301416d633110003748e5edab15bfe58889643e':
  Import translations. DO NOT MERGE