Merge "Clean up the keepalive slots when network disconnect"
am: 192f09d63e

Change-Id: I2cedf5752d37f96337ab69d94534cb7745e8efa3
tree: ead2464966b249bd7cc4393e0ee6511b573c394a
  1. core/
  2. services/
  3. tests/