Merge \\"Add a constant for when the storage manager is toggled on and off.\\"...
Merge \\"Add a constant for when the storage manager is toggled on and off.\\" into nyc-mr1-dev am: b5bb9f5c
am: 3d38bbb7
Change-Id: I76340654ee6904b4f02326b4242eaacf7ee5bf49