JDK 7

Change-Id: Ib07562b4dfff9af5184b62b7031194ed435f0775