Merge "Use word "languages" in favor of multi-locale support." into nyc-dev