Cleaned up upload job error reporting.

Change-Id: I2379d235eb9fed58412c9fefb9cabe56868395b9
(cherry picked from commit dd591578285123fb07f3bb2a5cfa4c64fc397326)