am 468daeb7: (-s ours) am 8aa54301: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '468daeb79106a71226382c3a6d41232addba1f9f':
  Import translations. DO NOT MERGE