Merge "libsnapshot: update offset functions" into main