Merge "[AAF] Fix AAF Configuration"