Merge pull request #17347 from spowelljr/fixCRIDelete #2715

Job	Run time
build_minikube	17m 21s
lint	5m 10s
unit_test	3m 20s
functional_podman_ubuntu	19m 19s
functional_docker_ubuntu	9m 38s
functional_docker_containerd_ubuntu	8m 54s
functional_baremetal_ubuntu20_04	6m 51s
functional_virtualbox_macos	37m 30s
upload_all_reports	31s
	1h 48m 34s

Provide feedback