Updated UploadWizard to master.

Change-Id: I59ef37b52b9a5e0503c6d42abee9cab0605acabe