Merge \\"Update UI for Storage settings.\\" into nyc-mr1-dev am: d65b27a02c
am: 007f83964c

Change-Id: I5b92608ccd6af6d2fccafdbe515ec424a108c4e9