Merge "Simpify logic in updateTcpBufferSizes"