[ros-diffs] [aandrejevic] 59500: Fix broken build after trunk merge.