Update UploadWizard to master

Change-Id: I015c3f64e676c5db31a6d4a42befc66224462842