[ros-diffs] [tkreuzer] 42244: Sync to trunk head (r42241)