Merge "Add fields used by NetworkStack to the API" am: 79a6d5e30c
am: 4bf93bb9c4

Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671