Merge "Fix a bug in StorageManager."