Merge "Update netId to nethandle mapping in NetworkTest." am: a04d0cc72f am: 503135596b
am: d9d2a71d6f

Change-Id: I6feaa589fc43ff8ee1635be0fbd58aaa25679a5a