Update component-level selection comments to match latest revisions

cmr=v1.7.4:reviewer=rhc