Upgrade from recent snapshot fails (BPI-R64)

I have been running into a sysupgrade issue on my BPI-R64 (mt7622) device. Sysupgrade works when upgrading from an older (just pre v22) snapshot to a recent snapshot, but fails when upgrading from a recent snapshot to another recent snapshot. Console log on failure shows:

[ 1149.562069] wl0-sta0: deauthenticating from a0:63:91:4b:b7:80 by local choice (Reason: 3=DEAUTH_LEAVING)
Watchdog handover: fd=3
- watchdog -
Watchdog does not have CARDRESET support
Fri Nov 11 01:14:50 UTC 2022 upgrade: Sending TERM to remaining processes ...
Fri Nov 11 01:14:50 UTC 2022 upgrade: Sending signal TERM to wpa_supplicant (1458)
Fri Nov 11 01:14:50 UTC 2022 upgrade: Sending signal TERM to wpa_supplicant (1474)
Fri Nov 11 01:14:54 UTC 2022 upgrade: Sending KILL to remaining processes ...
[ 1159.955651] stage2 (6733): drop_caches: 3
Fri Nov 11 01:15:00 UTC 2022 upgrade: Switching to ramdisk...
Fri Nov 11 01:15:02 UTC 2022 upgrade: Performing system upgrade...
grep: /sys/block/mmcblk0p65/mmcblk*p*/uevent: No such file or directory
Fri Nov 11 01:15:02 UTC 2022 upgrade: Upgrade completed
Fri Nov 11 01:15:03 UTC 2022 upgrade: Rebooting system...

I can verify that /sys/block/mmcblk0p65 doesn't exist. /dev/mmcblk0p65 exists, but it's not a real device so there is no /sys/block equivalent for it.