Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev