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

Change-Id: I46f302b0ab055d2c7f826502df09ce8a759db9bf