Merge "Fix broken kubernetes-cni dependency"