am: d4399625 * commit 'd4399625': Extra generic type information to aid certain javacs. Change-Id: Id609e78cc6429dcffeb5f44ca201ed6181e5009b