Optimized repo imports

Change-Id: Ib94f6c1c81614ae1a058322dbea50b85fc9dee42
Merge "Optimized repo imports"