Track more repos from CM

Change-Id: Iae2460c0ae17597dd868a633e80b72a2b0f27ad9