Merge "Add fields used by NetworkStack to the API"