Merge "Handle zero snapshot size appropriately." into rvc-dev am: 5b182952de

Change-Id: Ia2794499c5fc9cbbb7b09b1c0f7f73e4729cf2f7