Merge "Add AAI config changes"