[nvidia-persistenced/el8: 5/5] Merge commit '7a047c4b44f8a9fec7456771ffdf4247100f4f17' into el8