Merge "Fix TextClassifier logging." into pi-dev