Merge "Storage wizard UI tweaks." into pi-dev
am: 0e84839f62

Change-Id: I27d42323da5c0bb65620b3c73f78578de8040704