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

* commit '5998ef9fbf032e69ea7811282c680c2771066928':
  Revert "Update expectations for 031-class-attributes."

Change-Id: I385b76a780f33ac0c79a9967525227ac55848139