Merge "SnapshotManager expose no space error" am: 3be1310cf8 am: 5cf2d3ecc0 am: 7bcdc7d4af

Change-Id: Ie74e0d7a81aa24a88a3632e4a4ed2e2f4a27b9e1