Merge "Override package private methods to make them public for tests" into nyc-support-24.1-dev