Cherry-pick of #52188 into the 4.90.2 RC. Applied cleanly, no conflicts.

## Testing

- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually

Automated tests and manual QA were completed on #52188. This branch
carries the same change unchanged.