am: 2e755243 * commit '2e755243': Extra generic type information to aid certain javacs. Change-Id: I426b94a2928ad8880d1cfe86643eef3c3168b4d2