Merge "thermal-hal: Update Kalama configuration for skin"