Merge "Storage wizard string changes per UX request." into pi-dev am: 290edd0b73
am: 1e916920c5

Change-Id: Ie66f1e4d6daa98640e7e56efb7862be0d1c18914