Merge "Set keepalive socket timeout to default value"
am: 4c8baa10f9

Change-Id: I60e888f24a7de7dba0a09cd4cec2d13d5b47bb91
tree: dd8f0bb337c7b501596b8b710ef5be04a8b3d2e7
  1. tests/