Remove some unnecessary use of hidden APIs

Change-Id: Ie72947017550d759994e34d7db8087d1f9e6d63a
8 files changed