Merge "Empty interface IQuux which is completely unrelated to IBase and IBaz." into oc-dev
am: 837b40abe2

Change-Id: I736607036a29fd59279d3c31c1c786a79fcea727