Merge "Fix NetworkStackTests."