Merge "thermal: Fix sensor thresholds not accounted correctly"