Merged into Cyanogenmod repo