[ros-diffs] [jimtabor] 31373: fix build