The changes from https://github.com/NVIDIA/nvidia-container-toolkit/pull/1419 to fix https://github.com/NVIDIA/nvidia-container-toolkit/issues/1398 need to be included.