[ros-diffs] [weiden] 27956: Fix return types