Merge "Handle zero snapshot size appropriately." into rvc-dev