Merge "Refactor PackageWatchdog to use VersionedPackage"