Merge "internal support lib classes shouldn't be public" into nyc-dev