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