Merge "Fix NetworkScoreTest flake"