[ros-diffs] [tkreuzer] 35334: Sync to trunk head (35333)