am: 26e818d5 * commit '26e818d5': Revert "Update expectations for 031-class-attributes." Change-Id: I70950c685bdbb03f6815c2f65faeec06950b2991