Merge "Fixed Thermal HAL, added thresholds." into nyc-dev