Merge "Move NetworkTracePoller to a new file"