Dependencies from cm

Change-Id: I4c580bb19b35c199a0c32e24d65b4f5a61579a64