Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev