[nvidia-persistenced/f38: 2/2] Merge branch 'master' into f38