Merge "[AAI] Remove unused AAF proxies"