Merge "Revert "Support api to control data by thermal service""