Merge "Delay initialization of local repos"