[ros-diffs] [gvg] 14090: Make room for vendor import