Merge "Fix AAI auth in SO"