Merge "Revert "Change some default values for cvp jobs""