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