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

Change-Id: I4dce3a699666c8f75e028b7dc2e196ca0b44b41c
tree: f1b71f7fbc4980e77d663c1805acb25ca4b790ee
  1. core/
  2. services/
  3. tests/