Merge "Make chunkedUpload match upload behavior"