Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev