Revert "Update expectations for 031-class-attributes." am: 26e818d
am: 269374a

* commit '269374a023acf1af80ea45b99c7d1754a36e80f1':
  Revert "Update expectations for 031-class-attributes."

Change-Id: I5fc97c2f85e93fa86826d74ee7d06faa800a3dc4