Merge "Updating TextClassifier factory model names"