[ros-diffs] [weiden] 27626: Fix unoptimized builds