Merge "Change some default values for cvp jobs"