Get rid of some global scope assumptions in repo config

Change-Id: I54ffac4ed8d8be7e140f23ee52289e28a96677b0