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

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