am: 27a518a2 * commit '27a518a2': Revert "Update expectations for 031-class-attributes." Change-Id: I76723b271f5715a8e61f3336b9046af33d2b194b