[automerger skipped] Merge "[KA02] internal cleanup and refactor for...
[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 8f610000 am: 635691aa
am: 81865382 -s ours
am skip reason: change_id I9898324d2733b7012a372b1671b390c162544227 with SHA1 d8133600 is in history
Change-Id: I14af5fab536c69a870879fe5a1f512f3274a8b33