Merge "UsageStatsBackup Bug Fix"