Merge "Remove redundant TextClassificationService" into oc-dev