Merge "Extra generic type information to aid certain javacs." am: 9a62c015...
Merge "Extra generic type information to aid certain javacs." am: 9a62c015 am: 0a780cb8 am: a8025997
am: dcfef4a7
* commit 'dcfef4a7':
Extra generic type information to aid certain javacs.
Change-Id: I5eadc259b40744e0bfb4bb76c065bd1b75f2441c