Optimize Repo imports

Change-Id: I9d7f6b6b8154933031baba6f7c0083db3e4039c7