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

Change-Id: I5092a0a25a99e025200a4cd826e25463f5baa967