[ros-diffs] [jimtabor] 23432: Fix build