Merge "UsageStats: Handle the event count correctly." into main