[ros-diffs] [sginsberg] 37485: - Remove more instances of system_header