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

Change-Id: I23a18a71a5bc9867c0ac8fd3038a6fb3ec9de95a