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