Merge "SnapshotManager expose no space error"
am: 3be1310cf8

Change-Id: I0ddf4aa1baca81757f313d3cddaa11862875dfc6