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

Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd