Merge "Switch to returnCode for IPackageDeleteObserver"