Merge "Use InterfaceSet for upstream interfaces." into pi-dev