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

Change-Id: Iec295ec4149e7a545d7e345b00e50dbedc76a7c9