Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev am: 4c5e2bb526
am: 606f1fc7cc

* commit '606f1fc7cca3b61a9bdc04b6aecf56c00b74c01c':
  Hook up the automatic storage manager settings with the flag.

Change-Id: I244abd674cbc632607357f7c2b319752e2db6b00