[automerger skipped] Merge "Handle zero snapshot size appropriately." into...
[automerger skipped] Merge "Handle zero snapshot size appropriately." into rvc-dev am: 5b182952 am: c3b03768 -s ours
am skip reason: Change-Id I6c69f54820522d50c699384eec90c474ca3a9402 with SHA-1 83c690c7 is in history
Change-Id: I3ab62963527890840f6fbe9b1ace8d766358898f