JDK 7 build fix.

Change-Id: Iff1ee4bb8cf9f8d4c3ba8411d97921c73ca3e1e5