Fix issue with images not being uploaded

Change-Id: If7a8bc9582bac286674a2cf839538973d748415a