Merge "Revert "Update expectations for 031-class-attributes."" am: 04c2b2d am: 5998ef9
am: 27a518a

* commit '27a518a2ac553c80df20cdc823d1d3878e54feea':
  Revert "Update expectations for 031-class-attributes."

Change-Id: I76723b271f5715a8e61f3336b9046af33d2b194b