am 290b9aac: (-s ours) am 684934e8: (-s ours) am 9b389233: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '290b9aacd774f2477f700198df17bdb09e4c2173':
  Import translations. DO NOT MERGE