Fix derp on imports

Change-Id: I3ea2b1767d8788e7ab1ce3972d38b8d1a96477ff
Merge "Fix derp on imports" into kitkat