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

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671
tree: 1dccdc7fb051201dd30cec95c35c5a6ae1358822
  1. core/
  2. services/
  3. tests/