Merge "Add new no-op interface method." am: 726cb52790
am: 338dd4bda1

Change-Id: I134823c02d99eda33e34864b7ec8be13127acc79