[ros-diffs] [tkreuzer] 58042: Fix build