[containerd/1.7 backport] cherry-picks#175

crazy-max merged 3 commits intodocker:containerd/1.7docker/packaging:containerd/1.7from

crazy-max:containerd-1.7_cherry-pickscrazy-max/docker-packaging:containerd-1.7_cherry-picksCopy head branch name to clipboard