am f35f652a: (-s ours) am 1805b1a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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