Merge "Stop TCP keepalive from CS for fd initiated stop events"