Merge "Fix kick_transport test." into nyc-dev am: 550ad20d
am: 4d7a96c

* commit '4d7a96cf10f6d02bd9431a4731af1d3ccbe6460d':

Change-Id: I8ccb2111534ce17a34d39e56e398f64280774b0c