Merge "Use Sanitizer::mergeAttributes when merging classes into attributes"