Merge "Update netId to nethandle mapping in NetworkTest."