am fea91df7: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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