[ros-diffs] [royce] 19717: fix linux builds - sorry