Cherry-pick crrev/c/5233108

* This is not a clean cherry-pick, I simply copied the entire file as solving
merge-conflicts is not really necessary, once the CL itself make its way through
the import then the divergence will be removed.

Test: atest NetHttpTests
Change-Id: I0f13c2d71311e82f10c3efcaf2d12385df0932b2
1 file changed