Merge "Support for new multi-endpoint APIs." into nyc-dev