Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b am: 81bbdbb10f
am: 22ce4c1af7

Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33
tree: c424bed93fd684e285e2482dca190719a935307a
  1. core/
  2. services/
  3. tests/