Merge "[KA02] internal cleanup and refactor for SocketKeepalive"
am: 40b1b42419

Change-Id: I60e1780e34c1cd3a8f1e8ce38dc53843133660dc
tree: 2edcb12823438cfd18c6a6bb8d5169476d70cea4
  1. service/
  2. PREUPLOAD.cfg