Merge "TextClassificationManager API cleanup." into oc-dev