Merge master.

server.go

@@ -869,13 +869,11 @@ func (s *Server) sendResponse(t transport.ServerTransport, stream *transport.Str
  data, err := encode(s.getCodec(stream.ContentSubtype()), msg)
  if err != nil {
  channelz.Error(s.channelzID, "grpc: server failed to encode response: ", err)
- overallTimer.Egress()
  return err
  }
  compData, err := compress(data, cp, comp)
  if err != nil {
  channelz.Error(s.channelzID, "grpc: server failed to compress response: ", err)
- overallTimer.Egress()
  return err
  }
  hdr, payload := msgHeader(data, compData)