Merge "Use separate catch for getTcpKeepalivePacket"