Merge "[CVP] Fix cleanup execution for cvp jobs"