Merge "Fix kick_transport test." am: a960864 am: 119ca23
am: 2f46a7d

* commit '2f46a7d0ecdbff4cc8f08d2f63e855dde681cb25':
  Fix kick_transport test.

Change-Id: Iaa7282c15324e1e2e3aab03ba199d0527c07d0e2