[ros-diffs] [cfinck] 39229: Merge r39224 (riched20 sync)