Merge "Clean up the keepalive slots when network disconnect"
am: 8e63c9cc01

Change-Id: I2cedf5752d37f96337ab69d94534cb7745e8efa3