am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters

* commit '2e055d0e61fdda6b791bdcb076419310a31c24d8':
  DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters