Merge "Update netId to nethandle mapping in NetworkTest." am: 42293ba74d
am: 503135596b

Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212
tree: 6e8fd03d00c9a2e0114839b0d0cf77fd562f202f
  1. core/
  2. services/
  3. tests/