Move `attributes` to the `AttributeSet` object.
Merge pull request #15849 from sgrif/sg-move-attributes

Move `attributes` to the `AttributeSet` object.