Clean up use of hidden APIs
am: 4a2ff26de6

Change-Id: I53ef7b15c8c87cde1e067a8ea01a80e10d682318