Merge "Fix Incorrect AAI services"