Changes from Cyanogenmod repo