CADI AAF changes for policy on OOM