am e20e72da: (-s ours) am 78bf7235: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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