Bring in some needed CM repos

Change-Id: I78243629bb502a98b565535f9d94f0411f91e4a3