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

Change-Id: I3746b93cae3231117cd00ed84735aaf0b754a930