Merge "[KA04] Expose TCP socket keepalive API" am: e5f71e4ed0 am: e38d50b7c8
am: 58a1512d6a

Change-Id: I490acd417b3f70ba1dec3bbf9f049088b849c782