Merge "Remove DefaultContainerService usage in StorageManagerService."