Merge "Remove native thermal service"