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

Change-Id: I242fdacdd70729367f60da80a1a27d8f5a08dff6
tree: 6e2d1b717600b9c81b5c6c551663ab56b4990fb9
  1. core/
  2. services/
  3. tests/