Merge from Cyanogenmod