java import cleaning

Change-Id: I60587103dbf3980e22bc18eddee6c7c693ac3e57