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

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

Change-Id: I6ff0d60671fc77ef2cdaa1d89941fbeebfbbbbdc