Merge "Fix FD leak in NetworkStack"