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