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