Merge "Change the netId to nethandle mapping."
tree: 5893cbdeb4ce0b6a354a994c815ce3023d4e9d96
  1. core/
  2. services/
  3. tests/