Update UploadWizard to master

Change-Id: Ifafde5f6328d600aeee382488b1bdb75b6a233d3