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

Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33