Update UploadWizard to master

Change-Id: If44a24b4eb89cf3fe5bbc1a286ebfe296f0ef262