Merge "increase the thermal hal timeout to 5m"