Make changes to upload code resulting from testing

Make tweaks to the HTTP upload process that were revealed to be
necessary during the live network testing process.

Bug: 182425585
Test: manual
Change-Id: Ib0058bc6de4f8a5e2bb3f4d5b2e84c05d3617fad
4 files changed