some changes added to compile with java 7

Change-Id: I888d1934f2ac27c166f99026cfef35d4577d8d21