am 0630fbfb: Merge "DO NOT MERGE. Cherry pick \'Handle null testclass in test size filter.\'" into klp-modular-dev

* commit '0630fbfbd98e328aaa43b945b335a443893228e1':
  DO NOT MERGE. Cherry pick 'Handle null testclass in test size filter.'