Merge "Add the automatic storage manager settings." into nyc-mr1-dev