Merge "enable/disable the AAF by a env variable"