Extra generic type information to aid certain javacs. am: a0b1fd6752 am: 472f7143b4
am: bc00960c0f

Change-Id: Ic382f2e0bae783532c2dc95672a545d5add7059f