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