Merge "Update containerd version"