[ros-diffs] [tkreuzer] 38496: Sync to trunk r38250