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

* commit '87f022a716d73388c07e6a5df234d30d83840485':
  Import translations. DO NOT MERGE