Merge "Add a flag to toggle the automatic storage manager on and off." into...
Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev am: 9746deef
am: 15d6c4bf
* commit '15d6c4bf':
Add a flag to toggle the automatic storage manager on and off.
Change-Id: I39652f61fc252bfd7a50b801ea46d7d00c60e83b