am d9069ea0: Merge "Fix Hinglish subtype locale test"

* commit 'd9069ea076310a7e3c4d8fddb5dc80ee840bdc98':
  Fix Hinglish subtype locale test