Update UploadWizard to master tip

Change-Id: I965d0bb18008ddbd326b098c3fe23c3a764ae45a