Track more CM repos

Change-Id: I6c0b4fc1821f33bdc21d865365d8fc8f31fa16bf