Clean SubtypeLocaleUtils a bit

Change-Id: If8b981715983e3a12867c9b7c53bfa5effaddd39
2 files changed