Merge "Merge "Support testing upload/download packets" am: 139f43509e am: 99c1cc99e9"