Merge "Introducing StubVolume in StorageManager"
am: b499af866c

Change-Id: I56140a63dc711d4f34c098a2e937ed104f08ee7e