Merge "TextClassifier: Switch model based on locale" into oc-dev