Re: 8202469 / 8202473: Correct type annotation resolution for class type variables