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

Change-Id: Ieb86a638f45ed730d9af2737d23506e37e2c9d12