[ros-diffs] [sginsberg] 37671: - Fix release build