Merge "Remove shutdown of StorageManager"