am 3e7c3c39: (-s ours) am e98a55e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3e7c3c397bfd0f20db6719222218b349c3552e4d':
  Import translations. DO NOT MERGE