Merge "Update for the API changes." into nyc-dev