am 71830a1f: (-s ours) am 17578f5d: am cbd25628: am 147b50b6: am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters

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