[ros-diffs] [cgutman] 37317: - Fix CID 1380 and 1382 (Run 2)