Followup to #38163, also makes some changes intended to be included in that PR. Release Notes: - N/A
language_models