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