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

Change-Id: I061e84dc5277f78260fc92dace7cd98603f9f19a