Merge "Add tests for zero snapshot size." am: 2e66043394

Change-Id: I64233efbbfc9d54ca3e89c07b523e888536032ad