Merge "Extra generic type information to aid certain javacs." am: b88e8ddc52 am: d4399625aa
am: 2e7552431c

* commit '2e7552431cce028d5c9eba8e8cd5b2e4709215aa':
  Extra generic type information to aid certain javacs.

Change-Id: I426b94a2928ad8880d1cfe86643eef3c3168b4d2