Merge "Deal with split between IFoo and IHwFoo."