Merge "Do not lose message parameters in UploadFromChunks::verifyChunk()"