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

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