Merge "API cleanups per API review." into nyc-mr1-dev