Merge "Refactoring and some fixes around TextClassifierService"