Merge "Remove deprecated codes around TextClassifier"