Merge "Remove an interface before more invasive changes" am: e4a64b4e6b am: 2260679ecd

Change-Id: Id1c0ee31de7cdc2264d2c886a38a23ef0a942e64