Merge "Support testing upload/download packets"