Merge "Change the netId to nethandle mapping." am: 333dc71728
am: feaf412e19

Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
tree: 5893cbdeb4ce0b6a354a994c815ce3023d4e9d96
  1. core/
  2. services/
  3. tests/