Merge "Fix typo in Thermal AIDL interface and run update API"