Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev
am: 59d2b185f3

Change-Id: I013bac8d2d9cdda199a38572604a8b5771c2a40d