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

* commit '6ed3dc44b6a7abca582f2e05656562c09af369b0':
  Import translations. DO NOT MERGE