[ros-diffs] [jimtabor] 15446: Fixups.