[nvidia-persistenced/el7: 6/6] Merge branch 'f32' into el7