Merge "Attempt to fix NetworkTracePollerTest flake"