Merge "Change the netId to nethandle mapping."