Ensure repos are done in stage setup

Change-Id: Iae5459f301dd3957863084c1a2c610e18e3b3d36
Merge "Ensure repos are done in stage setup"