Remove use of private APIs

Change-Id: I3e28763075f8e92391796dc009214c9fa8f50008
16 files changed