am: 04c2b2de * commit '04c2b2de': Revert "Update expectations for 031-class-attributes." Change-Id: I38b30b15397b0c5515a02d55a05808f75e70fd68