Add CM dependencies

Change-Id: I0f129a65f2df8adef19801dd30543572edf37f02