Merge "update CMParts overlay for sholes" into gingerbread