Cleaning up temporary interfaces which were created for refactoring

Bug: 366237794
Test: Presubmit
Flag: EXEMPT refactor
Change-Id: Ibd14560241922aebb23d09876fde4e157193a02f
2 files changed