Merge "libsnapshot:snapuserd: Fix off by one error in merge path"