Merge "Adding crespo specific CMParts overlay" into gingerbread