[ros-diffs] [amunger] 17623: Fix cmd build. Please check your changes before commiting.