Merge "Add fields used by NetworkStack to the API"
am: aa983b7f1c

Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd
tree: ce71eac898c0dbf141d7b6492c43abb02d4e013f
  1. core/
  2. services/
  3. tests/