Update from CyanogenMod