Merge "Turn on TCP keep-alives and TFO (if possible)" am: 3ce916d29e
am: ce82f81759

Change-Id: I8bcb9623d4aa0bc9986ec4bb67615d51928cffc5