Merge "Color API comment updates."