Fix JDK 7

Change-Id: I2b241d2441a5919e60be0f5fea7868b913391cab