woops

Change-Id: I72202aa6eae109e9c9862750615f340d8a64bba8
some changes added to compile with java 7

Change-Id: I888d1934f2ac27c166f99026cfef35d4577d8d21