[ros-diffs] [gvg] 13673: Prepare for vendor import