am d7304020: (-s ours) am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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