Merge "Empty interface IQuux which is completely unrelated to IBase and IBaz." am: 931ca54208
am: 9af34a0c10

Change-Id: I29cc2b5225bc24f364f9ca399f8a728d7078c953