Merge "Extra generic type information to aid certain javacs." am: 9a62c01586 am: 0a780cb8b9 am: a80259979f
am: dcfef4a7d4

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

Change-Id: I5eadc259b40744e0bfb4bb76c065bd1b75f2441c