Merge "libsnapshot: Fix missing return keyword in error path." into main