am: 5998ef9f * commit '5998ef9f': Revert "Update expectations for 031-class-attributes." Change-Id: I385b76a780f33ac0c79a9967525227ac55848139