Merge "Replace hardcoded volume size by created volume size"