Merge "Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev am: df2a3295ca" into oc-dr1-dev-plus-aosp
am: b1f2552c56

Change-Id: Idd52f9ba0fb396208b28a632d8bbdf7489a9e63d