Merge "Fix kick_transport test." into nyc-dev