[ros-diffs] [tkreuzer] 44938: Sync to trunk (r44933)