More CM commits needed to compile

Change-Id: I1b4e2e1d02139e73976f11af639a752c075d15ca