Merge "[CLI] Remove aaf dependency"