Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev