Merge "Fix flaky testTcpBufferReset"