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

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