SK update

And can someone help with merging this to CM 10.2? :)