Fixing a couple of post-merge build errors.

[#53229997]