am f8257a0e: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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