Fix import and package derps

Change-Id: I16e032bb53a1da86e4d06a16930f50c11c3836bc