Merge "Address API review comments." into nyc-dev