Cm 10.1

Merge commit from CyanogenMod.