Merge "Add comment block matching the type defines added by RS."