Merge "Move csits form aaf to oom"