Optimized repo imports

Change-Id: I051a6a18a94bd5a679c9c479b51f32f9c8223e5c