Update UploadWizard

Change-Id: I2218f4d349cbda5b30590009fc7128c16cc8cb60