Improve error reporting for image uploads

Bug: 64213
Change-Id: I760b874dfab9d77d4330375aa8f66d0bb9b7a038
Merge "Improve error reporting for image uploads"