[nvidia-persistenced/f32: 5/5] Merge branch 'master' into f32