[ros-diffs] [tkreuzer] 40670: fix build