am b683a33e: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b683a33e593fb033cd2b145b751a22c47a2effe6':
  Import translations. DO NOT MERGE