Merge "Add new no-op interface method." am: 78bfc6f55f am: 6f918104aa
am: cd08de069a

Change-Id: Iae7e87a1965a549923875c13f142df09a2557672