Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev
am: 9746deefbb

* commit '9746deefbbfa3f6561bdf27e7d697cc352853f13':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: Icd5688b8ea9c72c6bab9dbb0eedd895bd0b09aca