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

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