Clean up use of hidden APIs am: 4a2ff26de6
am: 11a4e13c0c

Change-Id: I5c88858b0dc6e30c9d90984388a9d0ab086bf891