Merge "Fix Hinglish subtype locale test"