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

Change-Id: I87a2a929604f6fda9f2805224fffebfddc15e44c