Merge "Ensure UsageStats data is read correctly."