am 790a1895: Merge "DO NOT MERGE. Cherry pick \'Catch Errors when loading test classes.\'" into klp-modular-dev

* commit '790a18950902fadde82a1102c5aabcd40be91b93':
  DO NOT MERGE. Cherry pick 'Catch Errors when loading test classes.'