Merge "Update api for nyc-support-25.1-dev" into nyc-support-25.1-dev