Merge "TextClassifier: Switch model based on locale" into oc-dev am: dd83c2006b
am: 17710aeafa

Change-Id: Ic62bdfe913f01a22e7ddb2fa69cbc1db1162a9a5