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

Change-Id: I21499287085f7f12050063df4ca542ac9b666f7f