[ros-diffs] [tkreuzer] 38502: Sync to trunk r38500