Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515
am: 715bac98d5

Change-Id: I0cfb5c96efb2ddca14013d1f15125b117cfbaf7d