Use a couple CM dependencies for now

Change-Id: I281415188d42497931395ef2699bfbb7218e3e50