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

* commit 'eee0b01a11f7a2000bbb50e1bf0fbb4a44f72bee':
  Fix kick_transport test.

Change-Id: I152bf2ec3f6b6eee1c7ef79cb81e9581929ced5e