am 215f2f83: (-s ours) am da13330d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '215f2f83f17670a954dcff48d1cf821f6e0b5df7':
  Import translations. DO NOT MERGE