ensuring jdk1.6 compat

Change-Id: Ibbeb050bb9da4ccbf1e7c0ac1112b25668bbb8d4