Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028
am: 768b6c5e4a

Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe