Merge "Expose netId to SystemApi" am: cec4a7df3a am: bd154aca0c
am: bafe3cfffb

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