Merge "TextClassifier API updates." into pi-dev