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

Change-Id: I526918b546960dfe62e7f22b09f7883614daed32