Merge "Use a config flag instead of a RO flag for showing Manage Storage."...
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am: 3843dd96 am: 95ce1811
am: 350c9a3e
Change-Id: I0de070dc7208e646a8b5d675d3fd299727bbc61c