DO NOT MERGE Remove unnecessary internal APIs.

Test: Built
Bug: 146463528
Bug: 146590200
Change-Id: I5391ac4989d7d5712982f5608f9fc28cf7935b00
2 files changed