[ros-diffs] [tkreuzer] 45074: Sync to trunk HEAD (r45072)