Merge "Address API review comments for Thermal API"