[ros-diffs] [jimtabor] 17393: Merge change 17380 to 0.2.7 branch.