[ros-diffs] [cfinck] 39216: Merge r39215