Merge pull request #20662 from tonistiigi/containerd-integration

Containerd integration