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