Merge branch 'cpu-package-thermal' of .git into next