Merge "Fix PackageWatchdog and add PackageWatchdogTest"