Revert "[Tizen] Fix TC code conflict"