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