am b6c3d5b4: (-s ours) am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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