Allow compilation on cm

Change-Id: I1e3d5b558a8056d5b1d283293973f147e625dfc3