Update from Samsung Opensource

Rox@XDA rocks :)