Merge "Clean SubtypeLocaleUtils a bit"