am dd3162d9: (-s ours) am 778c2de0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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