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

Change-Id: I6b323384a81fd9f6371f4d2303cab819f41dfcb9