Merge "Minor cleanups to NetworkStats interface tracking."