[ros-diffs] [gvg] 17702: Fix release build