Merge "Fix NetworkScoreServiceTest.testSystemRunning."