Merge "TextClassifier updates"