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

* commit '26e818d520e8af9f1355a0eda6b111d741411210':
  Revert "Update expectations for 031-class-attributes."

Change-Id: I70950c685bdbb03f6815c2f65faeec06950b2991