Merge "Fix method declaration in UploadFromStash"