Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b am: d3c00327b9
am: 8323ab407b

Change-Id: Ib2b2474a74e2e84b3bb75c36b518ad48009065af