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

Change-Id: I5461398bd72c5c649aca862c3613f3ce29161820
tree: 6af588de58f28024f9e19b224945ecf9c4a16c82
  1. tests/