Inherit some thermal changes from our step brother "enterprise"

Change-Id: I2627df648cb42dc629922f84667c21c21968d31c