[ros-diffs] [mbosma] 22977: Add comments from cc-branch headers to trunk to make the header patch smaller.