(2/2) Flip upload/download positions

Change-Id: I30e63ab0b96b34518372f98804f564e93c511f30