Update from Cyanogenmod