Merge "Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6 am: 01828eb244 am: b68823cab8 am: 0872235d4c  -s ours"