Merge "Revert UsageStatsDatabase to version 3"