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

Change-Id: I22d626a3bfc89960271b63eb404dbfbb5456aa0a