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

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