Update UploadWizard to master

Change-Id: I29b5332eedd7b367ca77ddb37747089120f1f8b4