Merge "Remove never thrown UploadStashNotAvailableException"