Use public APIs instead of private ones

Test: builds
Change-Id: I4a8f289a1ac2ee6819bde5cd7c8edb98184c3c27
1 file changed