Merge "Use public APIs instead of private ones"