[ros-diffs] [amunger] 22899: Merge 22898 to branch.