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

Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c