[nvidia-persistenced/f40: 4/4] Merge branch 'master' into f40