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

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