am dc68bafc: Merge "Update run-test 031-class-attributes"

* commit 'dc68bafc29a457b1cc5b29a03f2ef5f2af77865d':
  Update run-test 031-class-attributes