Merge "[TC] fixed build error in entry TCs"