Plumb remove functionality through

Bug: 120981508

Test: manual
Change-Id: I4c9570ee1ed397b48d4948b79bb6f72188735e97
2 files changed