Merge "Fix sentence capitalization of locale names." into nyc-dev