Merge "Add NetworkStack metrics to system API"