[nvidia-persistenced/f27: 6/6] Merge branch 'master' into f27