[ros-diffs] [mbosma] 21911: Merge r21910 to the branch.