Bring in-line with official CyanogenMod repo