am bffca9c6: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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