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

Change-Id: If38cd52a3766aaadd43484ea1db58d74440b7428