Merge "Update storage wizard to latest UX mocks." into pi-dev am: daafeb35a1
am: 3847ad028a

Change-Id: I3095c525869754c9f9d8f447ffcd5352647312e7