Merge "Decouple Content Name Locale from Content Language Locale" into oc-mr1-dev
am: ea2c75f5ff  -s ours

Change-Id: I07337343468beab7c24d78624d1e84d2534c3ecd