Merge "Minor TextClassifier fixes" into pi-dev