Merge "Enable AAF at installation"