Merge "Hide APIs that shouldn't have been public" into nyc-mr1-dev