Merge "Have InProcessNetworkStack override NetworkStack"