JDK 7

Change-Id: I2c96c9bb15a93d0565b9bbde9753722f92200563