Merge "Update TCP buffer size for 5G data connections"