Merge "libsnapshot: Fix inconsistency in how merge ops are counted."