Merge "Add disk for StubVolume"