Merge "Use InterfaceSet for upstream interfaces."
am: e18fd9fff0

Change-Id: I4fa2446fe67ba2d88e4230f9accdfe0b8d2ec241