Fix unchecked warning for Java 7.

RB=282621
R=si-dev,jbetz,dhoa
A=jbetz