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

* commit '550ad20d64e3a4cc508fac172c62f16b0d201acd':
  Fix kick_transport test.

Change-Id: I178d5aa37fb77906b5487df2a7aa80cb01ee9f90