Merge "Update TCP buffer size when switching network type" into jb-mr1-dev