Merge "Decouple Content Name Locale from Content Language Locale"