Merge "Switch PackageStatusStorage to XML-based storage"