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