Merge "Update deletion conditions for a package's UsageStats." into sc-dev