Adapt for CM

Change-Id: I1dc5293aed2f7de8c8efe1e6530eb1776bf088fe