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

Change-Id: I19f5c7179a489e992356f141314582abc803ad2e