am c3e3f159: (-s ours) am 131e89ee: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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