Merge "libsnapshot: Fix CHECK failure during second phase merge"