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

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