Update UploadWizard to master

Change-Id: I2035c7268f6e21c798fd6973a688f9060c02a167