[ros-diffs] [sginsberg] 37136: - Fix release build -- attempt 2