Merge "TextClassifier: API rename" into oc-dev