Changes between #17765 and #17766

No builds.