Merge "Revert "Update expectations for 031-class-attributes.""
am: 04c2b2d

* commit '04c2b2de69460d41e0c39c1f7d9fb77376c3aa8b':
  Revert "Update expectations for 031-class-attributes."

Change-Id: I38b30b15397b0c5515a02d55a05808f75e70fd68