Merge "[TC-entry] build fail fixed"