Merge back earlier Intel thermal control material for 6.5.