Merge "Revert "Fix NetworkInterface cannot discover down links""