Reconcile ctrl_iface.c with CM

Change-Id: I0d81c11fb65d8ff1521de7f002fe46535e4d019e