Merge "Standardize RTT behavior across carriers"