Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev am: 59d2b185f3 am: ff18b331df
am: a988138f14
Change-Id: Id000d2de0816e8898c6230f7a81aa36885ae5b0f
This commit is contained in: