Merge "Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock."