Merge Cyanogenmod changes