am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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