[ros-diffs] [sginsberg] 37611: - Fix build