[ros-diffs] [gedmurphy] 30395: fix build