CM compilation fixes.

Change-Id: Ie335b6a48b7cdb333abc396e2e944ec483318f0f