[ros-diffs] [gvg] 18735: Temporary workaround to fix build