Merge "Make PackageKetSetData use erase"