Merge "snapuserd: Remove IByteSink usage from snapuserd."