Revert API removal

Bug: 128842115
Test: manual
Change-Id: Iff8e1a1c4c9dd6d089d0af6527bdd74ee38fa421
3 files changed