Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: df74b66a49
am: 7e4a1fa3c2

Change-Id: I12b61ddf713f017f6068f322bf7e62b503b2baca