Merge "[KA02] internal cleanup and refactor for SocketKeepalive"
am: 292da961e6

Change-Id: I211be98b0d3f5e1c7068a241cbd7e913ae72c461
tree: 1c5051df00fe915a12db6a63f55a43b9e4c87e9e
  1. core/
  2. services/
  3. tests/