Dependencies from CM

Change-Id: I63bde5761a7d617b0bef24e0dee6c70cdb939a7e