Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
am: 3d040e55d9

Change-Id: I2adbcb4260adc1719549ac4e26700a6dc099481e