Updating UploadWizard to master.

Change-Id: I91b071a586717d65c768192b7d1078c96360eb5a