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