am 64334e4f: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '64334e4f7f871c8192108679db0be38d42c8c7c0':
  Import translations. DO NOT MERGE