am 796c0c99: (-s ours) am fcf1178c: (-s ours) am 04e2eb1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '796c0c99bb8d6985fee9d3eb8cb7c127e952d952':
  Import translations. DO NOT MERGE