Merge "Expose netId to SystemApi" am: ed2644bf65
am: 4127bbc6bf

Change-Id: I23f6428954d08761d9671b419887d58dd29171fd
tree: 2d4debfd3bad78be5fe816b740ef524e07904b76
  1. core/
  2. services/
  3. tests/