Merge "Add a constant for when the storage manager is toggled on and off." into nyc-mr1-dev