Updates as per CyanogenMod