Removed usage of hidden APIs

Bug: 137202333
Test: manual
Change-Id: I2faccccff47a000954b8676a1b27e33d6b78061b
5 files changed