Merge "libsnapshot: Error handling after QuerySnapshotStatus"