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