am 0cbaa80a: Merge "Fix issue 28330: Gracefully handle corrupt .class files"

* commit '0cbaa80a1ac0195091a21d6810ee518a99a7ba49':
  Fix issue 28330: Gracefully handle corrupt .class files