Merge "Add support for RAT-based TCP buffer sizes"