[ros-diffs] [sginsberg] 38075: - Fix a broken loop - Remove unnecessary checks - Fixes CID 171, 172 and 655