am: 269374a0 * commit '269374a0': Revert "Update expectations for 031-class-attributes." Change-Id: I5fc97c2f85e93fa86826d74ee7d06faa800a3dc4