Remove unnecessary use of some private APIs

Change-Id: Idaba6833ddf4a8615845ca2f643c458bdeb9c403
4 files changed