am b17f61e3: am ebb6b5c9: Merge "Avoid marking erroneous classes as erroneous twice."

* commit 'b17f61e3f1f4b1f814ed9d879f00dcd4fe9b3257':
  Avoid marking erroneous classes as erroneous twice.