Merge "Fix NetworkScoreServiceTest.testSystemRunning." am: 5b4aec1dc6
am: 01828eb244

Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6