Merge "Revert "Update expectations for 031-class-attributes.""