Updated UploadWizard to master.

Change-Id: Ibbf2702feed4e096d5627f43130169bccc0d647e