Track more repos from CM

Change-Id: I2c8c76957d9755cd3a6658db0c3b5d7f3886da5e