[ros-diffs] [zguo] 58696: Fix build due to one of the previous merged versions depending on another post-branch revision that I do not want as part of the release.