Merge "Fix the unit test UsageStatsTest."