Update UploadWizard to master

Change-Id: I02e2c4028502a3a37afd23ce620f4bd52d8d51b1