Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am: 294b1586ed

Change-Id: I66b2876c923eed55804e14edc9f73ad619157336