Merge "Change the netId to nethandle mapping."
am: 9456c020d8

Change-Id: I605ea54ff9e8e32e4fad6f0346b37849fadbc81a