Merge "Fix StorageManagerIntegrationTest."