Merge "Fix volumes registered in ExternalStorageProvider"