fetch proper repos

Change-Id: Ia1f3841214fc8669a932e519b61df8aaccdcd6c3