am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"

* commit '89ab67578e4e06c41f0e96d840de952d10895233':
  Fix for updating TCP buffer size when switching network type