[ros-diffs] [sir_richard] 49432: [NTOS]: Remove merge artifact from newcc.