[nvidia-persistenced/f28: 3/3] Merge branch 'master' into f28