Merge "Bump containerd version"