Merge "UsageStats: Fix issue where initializing data for first time would cause crash"