Merge "Remove an interface before more invasive changes" am: e4a64b4e am: 2260679e am: 8087607f Change-Id: Ib8d4de706116b2b86e9fb22b8c3466ff22aac9e5