resolve merge conflicts of 550ad20d to nyc-dev-plus-aosp
am: 6b9de91

* commit '6b9de913cc2de427901dcadeb2a12a4e75d67986':
  Fix kick_transport test.

Change-Id: I775dbd0b7f6c0e16bc88bc08a1955b6ccbb61c40