Merge "Fix kernelToTag import in NetworkStatsFactoryTest."