use cm core

Change-Id: Ifae732c73cfc0827072556962611dfaa2fd2b776