Merge "Remove deprecated locales"