Fixing some build errors from the merge.

[#54065895]