Merge with CyanogenMod