Merge "TextClassificationManager API updates." into oc-dev