Merge "Fix flaky testTcpBufferReset" am: f2c7d5c49d
am: 07dfc766d8

Change-Id: I08452036ddfc3bc7f155c9fa0247288197f2e3ae